Began refactor.Added new folders and modified code structure.