WIP: Change module structure to explicit packaging