Update so it uses AMD and change directory structure