Changed directory structure
Updated source files
Updated sources
Updated source files to correctly load images
Updated Makefile