Reorganised source directory.