Improve project structure and change build settings