refactored repositories
fixed project