Refactor the Base App to be more modular