End of summer commit.

-Reorganized folders.
-To be polished in next couple weeks.