Store uploaded files in directory structure
Minor ui work