Adding some missing descriptions

also cleaning the structure