Project passed final refactoring