Fixed directory structure.
Updated to newer parent.