Fixed wrong paths

This commit is not as much diff as shoghicp's "Fixed wrong paths" commit.