Reorganized files with correct indent