Adding files and restructuring