Refactoring
Clean data directory