Refactor to make configs its own parent module
Merge branch 'working'