Move Utility file to proper dir