Folder Structure Change

Just got rid of the 2.0 folder so it looks normal. Make all edits in
main folders