Moved XML helper into Common
Fix to scaffolding ( removed hard coded template path )

Other misc fixes