Reformed code struture to allow managable development