Clean up initial dir structure