modified folder structure; updated config files