Reformatting code
Finished reorganizing, preparing to clean history