Improve organization and documentation.