cleaned up file formatting, shuffled around files for organization