Changed package for some classes