Relocated a few classes