modified moved classes packages and reimport changed classes