project structure reformat