Some late refactor in the project structure.