First commit of new plugin layout.