Cleaned up directory some more