Restructured everything!