Clean up dir structure