Added carmodel loading from file, moved some packages