moved some classes to a more specific package