Organizing the repository file and names