Restructured Directory

Restructured directory for better export process