refactor: Moving classes into project module