Changed package for base classes