Changed structure to allow for pip install.