2.05.4:schwarherz:2 partial for issue #157

did some file shuffleing