Moving modules under wpd namespace. Adding object to track application state