Feature/8257

Adding main folders to the src folder.
Any folders missing, should be created by the CLI written by chris