Revert 3cdb294..4302247

This rolls back to commit 3cdb29456ecd112e9ec2cb0cb876c621c65d32e9.
updated directories