Small refactoring and project structure changes.