Made it work with the package/directory imports