Fixed order creating
Removed create entity args
Renamed control entity structs