Moved utility classes to their corresponding folders instead of hanging loosely in the src folder