diff --git a/doc/Doxyfile b/doc/Doxyfile
index 0b73c089..15ae5ba0 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -664,6 +664,7 @@ INPUT                  = ../libraries/LCD \
                          ../libraries/DMD \
                          ../libraries/IR \
                          ../libraries/Crypto \
+                         ../libraries/RingOscillatorNoiseSource \
                          .
 
 # This tag can be used to specify the character encoding of the source files
@@ -754,6 +755,7 @@ IMAGE_PATH             = ../libraries/BlinkLED/examples/Cylon \
                          ../libraries/LCD/examples/Form \
                          ../libraries/RTC/examples/AlarmClock \
                          ../libraries/Crypto \
+                         ../libraries/RingOscillatorNoiseSource \
                          ../libraries/DMD \
                          ../libraries/IR \
                          ../libraries/I2C
diff --git a/libraries/Crypto/RingOscillatorNoiseSource.cpp b/libraries/RingOscillatorNoiseSource/RingOscillatorNoiseSource.cpp
similarity index 100%
rename from libraries/Crypto/RingOscillatorNoiseSource.cpp
rename to libraries/RingOscillatorNoiseSource/RingOscillatorNoiseSource.cpp
diff --git a/libraries/Crypto/RingOscillatorNoiseSource.h b/libraries/RingOscillatorNoiseSource/RingOscillatorNoiseSource.h
similarity index 100%
rename from libraries/Crypto/RingOscillatorNoiseSource.h
rename to libraries/RingOscillatorNoiseSource/RingOscillatorNoiseSource.h
diff --git a/libraries/Crypto/examples/TestRingOscillatorNoise/TestRingOscillatorNoise.ino b/libraries/RingOscillatorNoiseSource/examples/TestRingOscillatorNoise/TestRingOscillatorNoise.ino
similarity index 100%
rename from libraries/Crypto/examples/TestRingOscillatorNoise/TestRingOscillatorNoise.ino
rename to libraries/RingOscillatorNoiseSource/examples/TestRingOscillatorNoise/TestRingOscillatorNoise.ino
diff --git a/libraries/Crypto/ring_oscillator.fig b/libraries/RingOscillatorNoiseSource/ring_oscillator.fig
similarity index 100%
rename from libraries/Crypto/ring_oscillator.fig
rename to libraries/RingOscillatorNoiseSource/ring_oscillator.fig
diff --git a/libraries/Crypto/ring_oscillator.png b/libraries/RingOscillatorNoiseSource/ring_oscillator.png
similarity index 100%
rename from libraries/Crypto/ring_oscillator.png
rename to libraries/RingOscillatorNoiseSource/ring_oscillator.png
diff --git a/libraries/Crypto/ring_oscillator_basic.fig b/libraries/RingOscillatorNoiseSource/ring_oscillator_basic.fig
similarity index 100%
rename from libraries/Crypto/ring_oscillator_basic.fig
rename to libraries/RingOscillatorNoiseSource/ring_oscillator_basic.fig
diff --git a/libraries/Crypto/ring_oscillator_basic.png b/libraries/RingOscillatorNoiseSource/ring_oscillator_basic.png
similarity index 100%
rename from libraries/Crypto/ring_oscillator_basic.png
rename to libraries/RingOscillatorNoiseSource/ring_oscillator_basic.png
diff --git a/libraries/Crypto/ring_oscillator_multi.fig b/libraries/RingOscillatorNoiseSource/ring_oscillator_multi.fig
similarity index 100%
rename from libraries/Crypto/ring_oscillator_multi.fig
rename to libraries/RingOscillatorNoiseSource/ring_oscillator_multi.fig
diff --git a/libraries/Crypto/ring_oscillator_multi.png b/libraries/RingOscillatorNoiseSource/ring_oscillator_multi.png
similarity index 100%
rename from libraries/Crypto/ring_oscillator_multi.png
rename to libraries/RingOscillatorNoiseSource/ring_oscillator_multi.png
diff --git a/libraries/Crypto/ring_oscillator_sampled.fig b/libraries/RingOscillatorNoiseSource/ring_oscillator_sampled.fig
similarity index 100%
rename from libraries/Crypto/ring_oscillator_sampled.fig
rename to libraries/RingOscillatorNoiseSource/ring_oscillator_sampled.fig
diff --git a/libraries/Crypto/ring_oscillator_sampled.png b/libraries/RingOscillatorNoiseSource/ring_oscillator_sampled.png
similarity index 100%
rename from libraries/Crypto/ring_oscillator_sampled.png
rename to libraries/RingOscillatorNoiseSource/ring_oscillator_sampled.png