Changed everything
Restructured everything