Update Core, Add Core/Router