Flesh out an initial plan for the modularization
Fix language