changes before splitting files to util project