Work towards next version
Clean up classes into util package
Further restructuring
Generate hooman readable names