Remove Arthur and Restructure