Added menu entry
changed folder structure