improving structure of repository