Added new project structure for Calculator