improve code organization, use new hammerjs version