x86: major refactoring