restructured directory heirarchy
restructured directory heirarchy