rename files & add new build rules