Repository layout final