Refactor project and clean up.