Restructure

Merged to single assembly.