Orginized file hierarchy of templates, little markup/style changes