reorganization, nginx config fixes, script fixes