New folder structure, Header according wireframes