Alphabetised structures and others

PT - [Finishes #70334926]