Organizational stuff and moved benchmark timer code in utility source file