Restructured lib/import