Rearrange services in init, add thermald