Refactoring project architecture