Structural changes to some files

Structural changes of files to make code easier to read.