[WIP] Updated files and configurations

- Closes #15

| Q             | A
| ------------- | ---
| Tests pass?   | ?? ]
| Fixed tickets | #15 ]
| Doc           | none ]