Update utils to be PSR-2 & PSR-4 compliant