matching up x86 folder names with package
More moving files into appropriate folders
Added execution environments