Directory structure fixed.

Now v0.1 and v0.1en will be separate branches.