Restructured.
Extract multiple classes from same file.
Corrected