simplified hier blocks and added doxygen documentation
renamed blocks