Change file structure

Debated how these test files should be organized, decided on this
because it made sense to me. Took a little inspiration from Django.
gitignore issue
Merge conflict fix