move things to more sensible places