Moved some stuff around to fit imgspect into my new standards.