Start to reorganize code to not need platform injection everywhere