Cleanup directory structure a little bit