Modularize

Better description coming when I'm not on my phone. Wanted to give the poor bot a head start.