changing structure for a more profesional project