fix package structure breaking
fix deprecation warning