Reorganization of entire module
Notifying nginx is causing dependency cycle