Ian: attempt at refactoring the bitmap reader (not successful)
Ian: move test files into the correct location