Restructuring... using coffee-middleware