Optimize imports
Move test code into test folders
Support 129 branch in plugin and build update dependency to 129.60 (12.1 EAP RC)