[*, +] Spread classes in to new documents and refactoring