restructuring stuff
Reorganized the directory structure