Reorg of features dir, added guard + plugins.