restructure of build files