reorganization of some files and some tests