Reorganized files and added visitors