Moving some scripts around