changed directory structure and adapted composer settings