move all views into folders. add weapon views