changed entity folder name to entities
changed service folder name to services
changed form folder name to forms
fixed merge conflict