code style
reorganize package for more logicaly structure

removed KeyMap