#5 Reorganize common modules fix for sample.php