Rearrange files.
Added tag 2.2 for changeset c970cc637f26