Extended files functionality and Refactoring
Tested files extended
Directory funcs