progress towards a more standard library layout #10