changing dir structure and names for forms and touchlists
include touchlists
fixing touchlist includes