Add index and rename some directories