Move/rename files to function with pytest test sturcture and add __init__.py file
Merge pull request #991 from katharinechen/pytest-file-structure

Pytest Restructing