Restructuring

…and added path support for non BASE64 URI browsers