Re-organized library