More code refactoring, 35% progress on dev.AMD