Removed more modules as part of rebuild. Added new base library