Organization/formating fixes
More org changes