Moved some classes to the "components" package