renamed data directories
refactoring