Api project refactoring