minor changes
remove 'utils' requirement
move files to root-level