Move package
New code and add other functionality