Reorganized source files into folders