D3,Sush | #685 | fixing build and changinf module name.