Inconsistent location for plugins

[ashsmith]

I have noticed in app/code/Magento/CatalogUrlRewrite the location where Plugins are kept is inconsistent between Blocks & Models.

So in the code below (from app/code/Magento/CatalogUrlRewrite/etc/adminhtml/di.xml) shows Plugins for Models stored in the Model directory, but then Blocks and Controller Plugins are kept in a Plugins directory within the root of the module.

<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
    ...
    <type name="Magento\UrlRewrite\Model\StorageInterface">
        <plugin name="storage_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage"/>
    </type>
    <type name="Magento\Catalog\Block\Adminhtml\Category\Tab\Attributes">
        <plugin name="category_form_url_key_plugin" type="Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Category\Tab\Attributes"/>
    </type>
    ...
    <type name="Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper">
        <plugin name="product_save_rewrites_history_plugin" type="Magento\CatalogUrlRewrite\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper"/>
    </type>
</config>

Is there a reason behind this? Was it intentional?

Just to add to the list - there are also cases where model plugins are directly in the module directory

<type name="Magento\Catalog\Model\Product\Action">
    <plugin name="price_plugin" type="Magento\CatalogRule\Plugin\Model\Product\Action"/>
</type>

[davidalger]

This is an inconsistency in the core which needs to be addressed. The proper location per documentation is in <module>/Plugin/

plugin type: The name of a plug-in’s class or its virtual type. Use the following schema when you specify this element: \Plugin.

source: http://devdocs.magento.com/guides/v2.0/extension-dev-guide/plugins.html#plugin-declare

@davidalger the doc you linked to is not following its own guideline either

<?php
namespace My\Module\Model\Product;
class Plugin

[davidalger]

@fooman Thanks for pointing that out. Seems the docs need some updating then too! :)

cc: @xcomSteveJohnson

[vkholoshenko]

Internal ticket: MAGETWO-47664