Moving stuff around and redoing deploy