Change project structure to be more like 4.0 Refactor and remove old code as followup after deprecations fix