Refactoring DependencyMaps, delete unused file
add unit tests