Refactored the package to map (I don't feel that KLD is the right one, as it is a mix of different files)