move branching components to own directories