Change code layouts and rename support to util #9