Update files and restructured folders