moved files
clean, fixed tests
testing updates/removal of UUID from Entity