Move 3.x to a new make file

Similar to PR #2206 but has all of our version history and updated modules.