Refactor k2 into subdir