Issue 246: 	Source code modularization