Moved demo classes to default package