Reorganize project files
Update project settings