added support for folders
also, drag along using statements