Simplify component store even further, refactor systems a bit