Reorganized structure, moved images to their own directory