Second commit. Testing a different directoy layout. Removed a recursion level.