Move everything in a more appropriate place