Replace extends class

Add counstructor
Remove entity setup class