Modularize my config a bit