Merge pull request #4 from emcmahon013/master

Had issues with Inf
Folder Reorganization