refactored app to be inside container