Refactoring.
Updated build.