changed name of some files and logging behavior