moved classes to properly named packages