Fixed directory structure
Fixed merge conflict