Updating Features module, and changing namespace for better clarity.