Continue with project structure refactor.