#59 Restructured project structure