Rearranged files

Rearranged files
Updated Tests

Updated Tests to account for the rearrangement of files.