moved things to correct place