Refactor system and systemset to 100 line limit. Add entityhandler interface