clean, re-ordered project files and build settings