Initial cleanup
Magic boxes
More unrefactoring
Follow the use cases?
Just gone crazy
Removed Unused package