REFACTOR: moved class package
package description