Directories restructuring
Complete directory restructuring