moved registry classes to own package
refractored package structure