Restructured folder and did a bit more additions to the Passage Editor