added street spirits and moving and deleting existing entities and server upload