Moved image loading into the new loader module