Remove dump stmt
Replace with symlink
organize