Restructure of the base elements