Feature rejig prebuilts

Still contains some binary blobs... :-(