Fix paths
Extract files into separate directory