Added wireframes and reorganized