mv utils to subdir
move tests to subdir