New Package, cleaner

This update I started working more on cleaning up the code. - New
Manager Package