Moving more files around
Merge pull request #2 from AlecSKlein/more_file_restructuring

Moving more files around