Restructured packages to make room for new kata