further refactoring new things to old places. Unit tests now work, TODO test BasicNeuralModule, does not work now.