refactoring. added gateway and epu deployment