Oops, moved module back to correct positions. Other stuff..