Move things into proper packages