Correct Paths
Include missing files