Continued reorganizing the code and removing unneccessary or redundant files