Cleanup and Rebuild Package
Added some getters and builders