Update keylayout files
Rearrange init files
Rearrange services in init, add thermald