Updated smlib/feature-pluginmanager and cleaned up the directories