Restructured project for organization