refactoring
removed map two
renamed files
refactoring
removed old script