Takes out app from module
Adds missing files

And some conf functions