Revert "Main executables"

This reverts commit 923c1a0165486b0b2ecc3785f081547fda5009c0.
Revert "Revert "Main executables""

This reverts commit 3129a57522480ae0e8471a15e6c89d73d005a9d0.