Move some scripts around