#246: Source code modularization