Restructure

Restructure complete; Documentation bugs fixed.