Flatten/simplify lib structure

Structure predates npm days...