Changed Image Paths

To develop easier with and without visual studio
Refactoring

refactoring and some tests