A little renaming and structure
Got the midi header info ported over and added tests