refactored repository folder structure