Add ability to upload files containing directory information
Merge landing page index conflict