Refactor plugins out of plugin namespace