Moved db and app 'singleton's to their own modules