Re-factoring the project build.