Source directory restructuring