Moved Repository into a separate file