Reorganise styleguide #85

Have a look here #85