FP-92: reorganized
FP-92: launcher adapter