[Proposal] Directory structure modifications (to prepare for m2 build and to have a cleaner build)