Adjusted repo layout to match new framework architecture