Rearranged files and fixed image loading