Reestructure src again