Project Reorganization

Got a working .gitignore file up and got rid of the extra folder.
Should work now!