Code: Organize optimization folders.
* Analysis fixes.
* Other optimizations.
Merge pull request #474 from am11/master

Code: Organize optimization folders