initial refactor giving same results as develop
rename Extentions to contrib