reordered some files and added test cases for most instructions
forcing merge