Moving source directories and adding update comp/system.
Moving key handling into entities.