Moved modules to a package and adjusted everything else accordingly.