First commit for directory restructuring