Restructured
Removed pointless imports