observer added, packages reorganized