move things to proper places