Rename package names and move files

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

Fix package name because of recent packages renamed

Fix sub-package name because of recent packages renamed