Improve project structure