Made changes required for namespaces changes
Fixed proguard settings to work with new namespaces