directory rearrange under app directory