moved everything into src/, plus misc changes after long absence