Template classes should be moved from includes/style/ to includes/template/ and renamed. Locator class should be split into 2 classes: one that deals with style and subclass that deals only with template data.