Refactoring
Entity Component overhaul