Code: Organize optimization folders

* Analysis fixes.
* Other optimizations.