consolidating our folders
Merge pull request #3 from smonette/condense-folders

consolidating our folders