Restructure the whole thing, doing things right