Changing modules folders, as suggested by dbevenius
Fixes to get SimplePush working.