Reorganised source files