change project file structure to make it a little more clear