re-organized project structure