Added more aliases, improved uri parsing
File streams will now create a underlying folder