#104 fixed build dependency issue from separating the modules and completed merge conflict resolution.