Second batch of submission moves

The semantics batch will be next.