Improved binary file handling
Improved dir-tree loading