4 subfolder installs - pull request

Tested on normal, and multisite. For further testing.