moved some stuff around to fit the tone more
going back to root level in views folder, not as many changes as I had anticipated.