Moved some stuff around and pushing some created trace files