Refactoring

Still no units tests, but, I will rethink Jarvis architecture, so, they'll come later.