WIP: Refactor packages and classes