Move the remaining plugin components within the plugin source code. (cherry picked from commit 99173c5fc4)
99173c5fc4