Renamed some files

Finishing off combination and permutation