fixed compilation errors from package reorganization