Refactor everything into partials