separate scanner folder, added grammar analyzer