adding a section dedicated to RWD
refactoring and reorganizing