Cleaned up base directory