fix package_dir declaration and typing modules -> packages