remade directory structure and uri structure to use encoding (%20)