Remove utils to simplify file layout