Add spheron devices in new structure and create doxygen comments.
Cleaned up code and added doxygen comments.
Resolve merge conflict.