Moved configs as top level module
Merge branch 'working'