Even more moving around stuff and refactoring.