Added more classes and renamed sections to be more semantic.