rearranged directories to make proxying easier