moved some java classes to a more specific package