Correct paths
Handle nested directories