reorganise

before switch to jQuery mobile