Cleand up directory structure. Still haven't fixed crash on invalid node.