Changed dir structure
Fixed merge conflict