Rearranging names and dirs
Rearranging dirs and renamed some files