Added deep traversing, reorganizd modules
Added deep traversing, reorganized modules