Refactor code acc. to szezso's commits...

Didn't bring in liboverlay related commits, yet.

CAMERA NOT WORKING YET!