Refactor and move stuff.