refactored repository layout