A little cleanup

Moved files around. Ended up with stupid names but a cleaner app.d. I
think.