fix env and remove folder prefixes