Huge project architecture refactoring