Bug fixes and source code files reordering.
Authored by: vectorsigma 2018-11-15
Parent: [r177]
Child: [r179]