reorganized, see branch "master_old" for removed files