moved stuff to entities/ folder