Getting prepped for directory structure change