Moved all files into one folder. Won't need to use all the previous dirs