moving classes to proper subpackage