Cleanup File Layout

Moved files around to get rid of clutter and confusion.