Fixed formatting; added some structure for future

* Todo needs more work
* Need CONTRIBUTING guidelines