Moving between packages

Putting classes where they belong