Cleaned up dirs