Now the containing repository is stored within a folder. This will be necessary for moves.
Applied part 1 of Tommi's patch.