re-org structure and catalog directories part 2