Moved some things around.
Moved things around again.
Changed package name in java files