Prejects refactoring