Started organizing the software