Restructured everything and more