Reorganized files to work for links