Some refactoring. Some moving. More to come.