Made structural changes. Refactoring.