Fixed import feature to import folders too