Added other subdirectories to utils