Move Entity into lib