Revert "modify for CAF module naming"

This reverts commit 3cb24356716ea23c80f284d6c7602c1dac7cfbe9.
Revert "merging in houst0nn camera"

This reverts commit c0570277041ed6146b929ec1738c672962ac7921, reversing
changes made to e05ff54c552acb9ee3f7a55bc1cac3a305b9a418.