Refactoring and moving stuff around.