package structure fixes and other bug fixes