Move the preloader to a more sensible package. Fix some niggle with the button enablement config.