some files reorganization for tests and example