buttons updated & folder structure adjusted