Restructured project folder