Update the core structure, skip all tests in JBratRouterTest