Added current term directory and renamed some files