Use more consistent directory structure

This PR just moves a few files around to give a more consistent layout, and synchronizes the structure of the `test/spec/ol` directory with `src/ol`.