Deleted early implementations and moved files around