get rid of line number of inclusion
rename package related flag
rework package lookup