Restructured misc to utilities