Adapted startup to new subtree structure