Shuffle packages to more logical structure for the future.
Drop CLI plugin flag and just use service loader.