Re: Modularization of cruft in src/