Modularized the rest of the rotes. Started deleting some stuff