More standardization
add file as result of reorganization
More coding convention cleanup