Replaced the repository, location, component and binding classes by proper classes.