Restructured specs to mimic library