moving things to more correct places