Merge "Move general methods under utils file"