Re-structure and images now encode correctly!