updated project structure and class names