Moved some java classen to the correct packages