Dev changes (unstable)
Solved refactor issues
Solved refactor issues
Added test case for file discovering
Prevent global file