Updated file structure, link loader, url shortener