updated to actually include the package structure