Changed hierarchy, separated depot project