relocated and modified some packages