Moved asm files to seperate directory, merging

Merging through cpp.