Changes to move Forms from /src/Form to /src/Entity/Form