Fixed poor strucuture of previous repo