restructure application convention