More package restructuring
(I'll fix the errors when we decide on changes!)