refactored project structure and fixed executor confiuration