[REFACTOR] ORM: reorganise folder structure