cleanup
move utility files to dedicated directory