Massive cleanup, and moved entities into the same structure as SDK v1