more refactoring towards paas