You don't have to merge this pull, I made it so that I can comment on the differences.

Since you decided to create the Bapp app (the naming is not the best, but I didn't want to spend time renaming it) you might as well keep urls relevant to Bapp in its own urls file.