Source files re-organised