Big refactoring, config can now be overwritten by placing folder_name.yml and or a file_name.yml
Removed test code^
Merge branch 'master' into custom