New folder structure and working service with handlers