* More fixes in OpenLayers directory structure and files