[cosmeticp Struct refactoring 

v2 based on Aidan comments: 
* enforced 80 column in .h ( .c will be fixed during next wave of refactoring) 
* fixed alignment
* shorthen certain inner struct variable and struct variables. 

Pure struct refactoring, No inner function change , this will be done in the next stage , I only touched the .h files and cascaded the change through the .c