Moved some files to make it a bit easier to get. Also added some comments