Changing directory structure and adding files