Cleaner repo structure.