Refactoring the structure of our images