Revert "Unset wasn't what I wanted at all…."

This reverts commit 98f2e71efc62222e952497dae7761f9b11ca1ec5.
Drop EE1, rearrange folder structure, EE 2.6 compatibility