Move internal constructs into correct chapter