SLING-3651, organize imports, minor cleanup
SLING-3651, store only a project relative path