#2 - Remove not necessary files, move image names into macroses