Move interfaces into their corresponding classes.