Move non networking classes out of st-net