Great refactor. Project structure change.