Restructure project files
Restructure Project files