Restructured some stuff