restructured directory for import path