Update Main.cpp
Moving headers to one folder
Renaming some headers
Renaming main.cpp