Continue cleanup; Initial Carla-as-plugin code (new version)