Moving some classes, fixes #226