organize app bootstrap, not great but improved