Reorganized files for better understanding