renamed component package and moved some classes to more specific package