Remove unused files, finalize test structure
Resolve merge conflict in README.md
Merge pull request #1 from nickb1080/test

Remove unused files, finalize test structure