New directory structure and refactored filoIo.py