Move unwise assert to more appropriate location
Rearrange class file layout for clarity