Attempt to simplify code layout: everything now in src/