Updated build
Correct paths
Correct paths