Remove homework-package, organize homework-class