More progress and refactoring.
Removing files due to refactoring.
More work done.