Cleaned up the module defs. not using pkg.rs anymore.