Reorganise styleguide #85