Merge pull request #1 from jeffdavidthompson/newbranch

Newbranch
reorganize files and delete extras