Turned on stricter compiler settings. Also reordered files.