Restructure

Merged back supporting libraries;
Restructure

Restored references;