Add utils and data directories