Refactoring project api