Also move GLOBAL_WRITABLE_FILES and USER_SETTINGS_FILES to the recommended location, just before PROVIDES.