mv custom plugins to plugins dir

Change-Id: Ice4d07e5e448d4afb9b47e6e919f8df35be4a1f1
remove unused imports

Change-Id: Ibd17adbb496e5181c9fb4d657258a2a8df4ec905