Cleaned up project file structure