project structure updated and added some classes