Remove former top-level entries that are now in trunk (part 2) Add tags and branches at the top level.