Loader changes
Re-organize the Launcher code a bit