Reunify core with rx subprojects