issue #19 refactor files and filenaming step2