Reorganized files
Enhanced code