Restructured files

Restructure to make it easier to track and drop into config folder