Moved files into proper location and reformatted to new weapon format