Moved stuff into x86 project