Organize imports: commit to satisfy Eclipse peculiarity
Commons moved to a separate file (inside util now)