Refactor src to departure