entity system and various file merges