Add a bundle for the project.
Refactor code to reduce number of methods. Change control flow logic.