Re-organizing files into folders

Re-organizing files into folders