Apply new code structure