Rearrange some files, prevent view resolvers from clashing.