cleanup
Add some packaging stuff
rearrange