Move trunk/ into base dir, move tests into devel/.