[WIP] Updated files and configurations

- Closes #15