Restructured some parts