Refactored and added custom data directories