Re-structured repository