Moved mapping into deprecated dir
Some refactoring.