Refactor structure

- follow structure exampe [here](https://github.com/mattupstate/overholt)