Refactor clases, new documentation