Refactoring code
Refactoring code
Fix image in Build, add moveImage