[fix] Fixes for the package structure optimization