Added generic camera support to server
Refactored code server