Reorganizing symantic analysis - not yet completed