Formatting cleanup
Library restructuring