Reorganized api2 packages