Better organizing the nsq dir structure