First commit for directory restructuring
Directories corrected