Added entity subpackage