Moved some entities from lib/ to lib/entities/