rearranged to webapp like structure