Refactored Entity relationship
Moved REST api to /api