Project structure refactored.