class is now compatible with new package structure