Restructured directory and packages