Commit before possibly breaking everything to restructure