moved some more packages and added some more stuff