Moving classes

The classes needed to be moved, because they were not originally created
in a package structure.