entity types

experimenting with three different types of entities
moved _all_ entity types into subdirectory