Refactor GUI util classes with consistent names and in a separate folder