Reformat project structure