Rename package names and move files

Rename package names and move files into different packages to neaten the
project.