restructured folders
fixed merge conflict