Cleaned URLs, added subfolders