finish migrating all code back into one repo