Cleaned up diretory structure.