Some refactoring
Sources for *.bmp files