Cleaned up the directory structure.
Fixed compatibility with NumPy <= 1.7.1.