Updated package hierarchy, replaced direct accesses with settet/getter
methods.