changed folder structure
changed format slightly