changes to folder structure at config
merge develop changes to master