Buttons while building & some files moved