Raname files and dirs to reflect common naming convention
Rename util/* to util/util/*