move nginx out to its own container; cleanup