Fix/new webapp org

This PR includes a new organization for the webapp generator