Modularize Camera rule
Merge branch 'refactor' of ssh://git.hackens.org/Jarvis into refactor