Folder structure change; Further improvements of parser code