Fix package names, add router, direct pipeline