Little bit of moving

Shifted some things around, to prep for wall-collision-detection.