Added changes to restructure module resource and for spec tests