rearranged some view files