Rename some folders
More Uncrustify tweaking
Re-align style property names with uikit
uncrustivy