First commit of the code refactor.