package hierarchy updated, TODO resolve all compilation errors