Revert "Revert "fixed error with importing files""

This reverts commit 8a8cd8f6b6a581b78917efa8412fd0b9c1dc5856.