Minor changes, renaming of files, code cleanup.
Authored by: bartpved 2012-10-01
Parent: [r227]
Child: [r229]