Structural changes of files to make code easier to read.
mentioned in commit d78d9864
spent 7h
added 7h of time spent
