update structure of common utilities module