moving classes to specified packages - fix