Add some semantic tags
Reorganization of texts