Restructure project file structure