Cleanup project.
Some refactoring.