Refactored basic project structure