Feature/camera gallery refactor

Didn't know about this file... I'll try to remember for the next time...