refactored repository layout, etc.