Clean up imports, move code to Temper library