structure of components re-organized, moved some classes to other
packages