Added menu entry
New folder structure