Package Cleanup

:construction: 
includes #19 , I'll rebase