refactor
app module
Compatibility with docker