reorganising to focus on simpler cases
ignore Mac files