Refactor, split larg files