Move ModelJDBC to respective package (without breaking compatibility)