Relocated files (hopefully for the last time)

my ocd kicked in