More Improvements
Restructured everything