Add some source files to packages instead of having them manually added to embeddings

@yurydelendik, I'm not sure why these were added manually. But it seriously gets in the way of getting shell unit testing to run again. Move to other packages as needed, I guess.