Cleaned file structure and implemented URIs