Restructured project structure