Restructured project directory