Move style into directory.
Renamed class and added annotations.