move classes to appropriate packages