Migrated to recommended structure and added router.