Reformat

Moved around files for organization.