Moved some scripts around