move class to appropriate package