Make module generic and fix permissions
Update manifests according to modules