Move Those Files

Moved files around to adhere to the actual relationship model of the
files.