Removed eval's.
Improving the regexs in file pattern matching, removing some console.logs