Project/User: code cleaning and project reordonened