Added config templates to org and few other refactoring