added square brackets to folders and added invalid_illegal and invalid_deprecated keywords