Move util classes into their own folder
Change PrefsBar to UI file
Make PrefsBar not expand