split various versions into separate files
cleanup