Fully converted to new repo format & tested