Refactored out filelocatation.
Recursion should work again...