restructured so source is in src/