Optimization - Restructure Folder Layout for Consistency

Restructured libraries for a more readable, straight-forward and
consistent flow.