Project file structure improved