Fixed dependency name
Fixed folders according to namespace