Move utility methods inside project