moved away some packages and some minor changes