final and buildnumber are optional files. Move them into resources to avoid naming them explicitly. (cherry picked from commit fae9650f56854bb3f3508ee5b2625bba8e7ad2f8)
(cherry picked from commit 9019cbfd2b715c35da10ad7ed79d44ab81e57052)
No real functional improvements yet, just reorganizing to make improvements easier.