Revert moving the Features module convention