Restructure

Removed null-class;