Restructuring finished except for point functionality