refactored package names. added Parcelable object