fix src organisation