Fix package and name of classes