Cleanup Plugin organization