Moved some classes/interfaces to their appropriate packages.