Added and renamed packages. Let me know if you don't think this is a
good system.