Adding files in proper directory structure