Move package and update code slightly