* start to move big chunks of code into functions so we can write some tests
* change dir structure for testing