refactoring more
updating composer
refactoring to twig