Moved classes to correct package