Fixes
Directory cleanup