Aesthetic changes
Moved files around. Added TODO with ticket ref
Catching potential IOException
Added TODO