Update app to refactor various processes into modules
Fix merge conflict when merging master branch