Added bundle where files are in different folders and have imports.
Changed so the file path resolver is reset for each file (since they could be in different folders.