Images + Added / Moved refactory