refactoring - rename MutableMap.put -> MutableMap.addOrReplace
simple refactoring - MutableSet.remove -> removeIfExist
adjust structure of files. fix test failure in maven build