Refactoring project architecture.