[ADD][EDIT] Structured directory and Peon class aggregate